Refactor imports #109
Merged
Refactor imports #109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index imports so that any duplicate aliase can be detected immediately before they are added. Instead of hiding the types.TypeString call, implement a types.Qualifier which can be used to return the package alias.
dnephin
force-pushed
the
refactor-imports
branch
from
55e6de7 to
43c541f
Compare
| } | ||
|
|
||
| // AddImport creates an import with the given alias and path, and adds it to | ||
| // Fake.Imports. | ||
| func (f *Fake) AddImport(alias string, path string) Import { | ||
| func (i *Imports) Add(alias string, path string) Import { | ||
| // TODO: why is there extra whitespace on these args? |
There was a problem hiding this comment.
Not sure I understand; which white space / args are you referring to?
There was a problem hiding this comment.
path and alias are both passed to strings.TrimSpace so I assume there is either leading or trailing whitespace on those strings, but it is not clear to me where that would come from. It seems like this is called with values from inspecting go/types, which I would assume do not contain extra whitespace.
There was a problem hiding this comment.
I guess I am just always defensive with function arguments (particularly when exported).
unvendor was a copy of this function. x/tools/imports is already a dependency of this package.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I believe in order to implement #103 properly 2 changes must be made:
types.TypeStringneeds to be called withtypes.RelativeToto remove the package selector when the package matches the target packagetypes.TypeStringfor the line withvar _ {{.TargetAlias}}.{{.TargetName}} =This refactor should make it easier to implement both of these changes. It reduces the code required to handle imports, and I believe makes it easier to follow by doing de-duplication immediately, instead of a post-processing step, which required changing aliases and logic related to imports to
Index imports so that any duplicate aliase can be detected immediately before they are added.
Instead of hiding the types.TypeString call, implement a
types.Qualifierwhich can be used to return the package alias. In a follow up PR this can be updated to make the call totypes.RelativeTo.